Merge remote-tracking branch 'origin/jsxswms' into jsxswms

zhou zhou

7 天以前 92ff7ea27e6f99c004c727d471f2f3d82c1c3a30

 src/main/java/com/zy/asrs/entity/BasQualityTesting.java

@@ -1,5 +1,7 @@
package com.zy.asrs.entity;

import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableField;

import io.swagger.annotations.ApiModelProperty;
@@ -17,6 +19,7 @@
     * ID
     */
    @ApiModelProperty(value= "ID")
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    /**