商品修改的sql，对非必填的字段，为空也可以set

fs-service/src/main/resources/mapper/hisStore/FsStoreScrmMapper.xml

@@ -60,7 +60,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="medicalLicense"	column="medical_license" />
         <result property="medicalLicenseExpiryStart"	column="medical_license_expiry_start" />
         <result property="medicalLicenseExpiryEnd"	column="medical_license_expiry_end" />
-
         <result property="settlementAgreement"	column="settlement_agreement" />
         <result property="settlementAgreementStart"	column="settlement_agreement_start" />
         <result property="settlementAgreementEnd"	column="settlement_agreement_end" />
@@ -391,15 +390,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="medicalDevice1 !=null and medicalDevice1 !=''"> medical_device1 = #{medicalDevice1} ,</if>
             <if test="medicalDevice1ExpiryStart !=null "> medical_device1_expiry_start = #{medicalDevice1ExpiryStart} ,</if>
             <if test="medicalDevice1ExpiryEnd !=null "> medical_device1_expiry_end = #{medicalDevice1ExpiryEnd} ,</if>
-            <if test="medicalDevice2 !=null and medicalDevice2 !=''"> medical_device2 = #{medicalDevice2} ,</if>
-            <if test="medicalDevice2ExpiryStart !=null "> medical_device2_expiry_start = #{medicalDevice2ExpiryStart} ,</if>
-            <if test="medicalDevice2ExpiryEnd !=null "> medical_device2_expiry_end = #{medicalDevice2ExpiryEnd} ,</if>
-            <if test="medicalDevice3 !=null and medicalDevice3 !=''"> medical_device3 = #{medicalDevice3} ,</if>
-            <if test="medicalDevice3ExpiryStart !=null "> medical_device3_expiry_start = #{medicalDevice3ExpiryStart} ,</if>
-            <if test="medicalDevice3ExpiryEnd !=null "> medical_device3_expiry_end = #{medicalDevice3ExpiryEnd} ,</if>
-            <if test="foodLicense !=null and foodLicense !=''"> food_license = #{foodLicense} ,</if>
-            <if test="foodLicenseExpiryStart !=null "> food_license_expiry_start = #{foodLicenseExpiryStart} ,</if>
-            <if test="foodLicenseExpiryEnd !=null "> food_license_expiry_end = #{foodLicenseExpiryEnd} ,</if>
             <if test="medicalLicense !=null and medicalLicense !=''"> medical_license = #{medicalLicense} ,</if>
             <if test="medicalLicenseExpiryStart !=null "> medical_license_expiry_start = #{medicalLicenseExpiryStart} ,</if>
             <if test="medicalLicenseExpiryEnd !=null "> medical_license_expiry_end = #{medicalLicenseExpiryEnd} ,</if>
@@ -416,8 +406,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="businessCode !=null ">business_code=#{businessCode} , </if>
             <if test="drugCode !=null ">drug_code=#{drugCode} , </if>
             <if test="medicalDevice1Code !=null ">medical_device1_code=#{medicalDevice1Code} , </if>
-            <if test="medicalDevice2Code !=null ">medical_device2_code=#{medicalDevice2Code} , </if>
-            <if test="medicalDevice3Code !=null ">medical_device3_code=#{medicalDevice3Code} , </if>
             <if test="foodCode !=null ">food_code=#{foodCode} , </if>
             <if test="medicalCode !=null ">medical_code=#{medicalCode} , </if>
             <if test="otherSpecialQualificationCode !=null ">other_special_qualification_code=#{otherSpecialQualificationCode} , </if>
@@ -439,14 +427,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="settlementAgreementFileName !=null ">settlement_agreement_file_name = #{settlementAgreementFileName} , </if>
             <if test="qualityAssuranceAgreementFileName !=null ">quality_assurance_agreement_fileName = #{qualityAssuranceAgreementFileName} , </if>
             <if test="otherSpecialQualificationFileName !=null ">other_special_qualification_fileName = #{otherSpecialQualificationFileName} , </if>
-            <if test="medicalDevice2BusinessScope !=null ">medical_device2_business_scope = #{medicalDevice2BusinessScope} , </if>
-            <if test="medicalDevice3BusinessScope !=null ">medical_device3_business_scope = #{medicalDevice3BusinessScope} , </if>
             <if test="drugLicenseBusinessScope !=null ">drug_license_business_scope = #{drugLicenseBusinessScope} , </if>
             <if test="foodLicenseBusinessScope !=null ">food_license_business_scope = #{foodLicenseBusinessScope} , </if>
             <if test="drugScopeHasFrozen !=null ">drug_scope_has_frozen = #{drugScopeHasFrozen}, </if>
             <if test="reportUrl !=null ">report_url = #{reportUrl}, </if>
             <if test="filingUrl !=null ">filing_url = #{filingUrl}, </if>
             <if test="permStatus !=null ">perm_status = #{permStatus}, </if>
+            medical_device2 = #{medicalDevice2} ,
+            medical_device2_business_scope = #{medicalDevice2BusinessScope} ,
+            medical_device2_code = #{medicalDevice2Code} ,
+            medical_device2_expiry_start = #{medicalDevice2ExpiryStart} ,
+            medical_device2_expiry_end = #{medicalDevice2ExpiryEnd} ,
+            medical_device3 = #{medicalDevice3} ,
+            medical_device3_expiry_start = #{medicalDevice3ExpiryStart} ,
+            medical_device3_expiry_end = #{medicalDevice3ExpiryEnd} ,
+            medical_device3_code = #{medicalDevice3Code} ,
+            medical_device3_business_scope = #{medicalDevice3BusinessScope},
+            food_license = #{foodLicense} ,
+            food_license_expiry_start = #{foodLicenseExpiryStart} ,
+            food_license_expiry_end = #{foodLicenseExpiryEnd} ,
         </trim>
         where store_id = #{storeId}
     </update>

fs-store/src/main/java/com/fs/hisStore/controller/store/FsStoreScrmController.java

@@ -112,7 +112,6 @@ public class FsStoreScrmController extends BaseController {
     /**
      * 修改店铺管理
      */
-
     @Log(title = "店铺管理", businessType = BusinessType.UPDATE, logParam = {"店铺", "修改店铺信息"}, isStoreLog = true)
     @PutMapping
     public AjaxResult edit(@RequestBody FsStoreScrmInfoParam fsStore) {