Merge branch 'develop'

csm-service/cms-service-user/src/main/resources/application-dev.yml

@@ -69,7 +69,7 @@ wx:
 
 third-party:
   ali:
-    app-code: 524b1864a88f47458c1061bae3811570
+    app-code: c8f465f3ba2d4db3b0bb2e1a1bc5887e
   qcc:
     app-key: 5015e664848d406ab1ca4b505c3da803
     secret-key: 7C4DB8CCECC148175E46392CC0A1B410

csm-service/cms-service-user/src/main/resources/mapper/UserServiceDao.xml

@@ -147,8 +147,9 @@
                 brief_introduction=#{briefIntroduction},
             </if>
             <if test="password !='' and password != null">
-                password=#{password}
+                password=#{password},
             </if>
+            update_time = NOW()
         </set>
         <where>
             id = #{id}

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/cms
-  newTag: dcab0bb8547a2a772995a18d548fc14032f4ea49
+  newTag: 2300d43322ec784ffe8ea8735d9e53d903ee96fb