Merge branch 'develop_migration' into 'develop_master'

feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!260

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java

@@ -38,10 +38,14 @@ public class SarBussionessStand extends BaseEntity {
     @TableId("ID")
     private String id;
 
-    @ApiModelProperty(value = "标准编号")
+    @ApiModelProperty(value = "企标标准号")
     @TableField("STAND_CODE")
     private String standCode;
 
+    @ApiModelProperty(value = "标准编号")
+    @TableField("STAND_NUMBER")
+    private String standNumber;
+
     @ApiModelProperty(value = "标准名称")
     @TableField("STAND_NAME")
     private String standName;

adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml

@@ -37,19 +37,20 @@
         <result column="standSortShow" property="standSortShow" />
         <result column="stand_year" property="standYear" />
         <result column="text_status_buss" property="textStatusBuss" />
+        <result column="stand_number" property="standNumber" />
     </resultMap>
 
     <!-- SAR_BUSSIONESS_STAND table all fields -->
     <sql id="Base_Column_List" >
      modify_time, creation_time, valid_flag, stand_status, replaced_stand_num,replace_stand_num,
-     put_time, issue_time,stand_en_name,stand_name, stand_code, id,apply_country, stand_nature, stand_sort,text_status_buss
+     put_time, issue_time,stand_en_name,stand_name, stand_code, id,apply_country, stand_nature, stand_sort,text_status_buss,stand_number
   </sql>
     <sql id="Base_Column_List_show" >
         SAR_BUSSIONESS_STAND.modify_time,
      SAR_BUSSIONESS_STAND.creation_time, SAR_BUSSIONESS_STAND.valid_flag,
      SAR_BUSSIONESS_STAND.apply_country, SAR_BUSSIONESS_STAND.stand_nature,SAR_BUSSIONESS_STAND.stand_sort,SAR_BUSSIONESS_STAND.stand_year,
      stand_status, replaced_stand_num,replace_stand_num,put_time,issue_time,stand_en_name,
-     stand_name, stand_code,SAR_BUSSIONESS_STAND.id,SAR_BUSSIONESS_STAND.text_status_buss
+     stand_name, stand_code,SAR_BUSSIONESS_STAND.id,SAR_BUSSIONESS_STAND.text_status_buss,SAR_BUSSIONESS_STAND.stand_number
   </sql>
 
     <sql id="Group_Column_List_show" >
@@ -168,6 +169,7 @@
             <if test="standNature != null" >stand_Nature,</if>
             <if test="standSort != null" >stand_sort,</if>
             <if test="standYear != null" >stand_year,</if>
+            <if test="standNumber != null" >stand_number,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides="," >
             <if test="modifyTime != null" >#{modifyTime, jdbcType=TIMESTAMP},</if>
@@ -187,6 +189,7 @@
             <if test="standNature != null" >#{standNature, jdbcType=VARCHAR},</if>
             <if test="standSort != null" >#{standSort, jdbcType=VARCHAR},</if>
             <if test="standYear != null" >#{standYear, jdbcType=VARCHAR},</if>
+            <if test="standNumber != null" >#{standNumber, jdbcType=VARCHAR},</if>
         </trim>
     </insert>
 
@@ -246,6 +249,9 @@
             <if test="standYear != null" >
                 stand_year = #{standYear},
             </if>
+            <if test="standNumber != null" >
+                stand_number = #{standNumber},
+            </if>
         </set>
         where id = #{id}
     </update>
@@ -301,6 +307,9 @@
             <if test="standYear != null" >
                 stand_year = #{standYear},
             </if>
+            <if test="standNumber != null" >
+                stand_number = #{standNumber},
+            </if>
         </set>
         where id = #{id}
     </update>