Merge branch 'cc_20241119_optimize' into 'master'

Cc 20241119 optimize See merge request hangzhou/java/custom_zxjp!30
2024-11-20 02:37:52 +00:00
parent f7b71b7da1 0bf59881df
commit 9b8f544514
1 changed files with 3 additions and 3 deletions
--- a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml
@@ -223,7 +223,7 @@
          #{param.partnerNum},
        </if>
        <if test="param.franchiseBrand != null">
-          #{param.franchiseBrand},
+          #{param.franchiseBrand}
        </if>
      </trim>
      ON DUPLICATE KEY UPDATE
@@ -313,10 +313,10 @@
          deleted = #{param.deleted},
        </if>
        <if test="param.partnerNum != null">
-          partner_num = #{param.partnerNum}
+          partner_num = #{param.partnerNum},
        </if>
        <if test="param.franchiseBrand != null">
-          partner_num = #{param.franchiseBrand}
+          franchise_brand = #{param.franchiseBrand}
        </if>
      </trim>
    </insert>