Merge branch 'develop'

cms-common/cms-common-util/src/main/java/com/mmc/iuav/auth/JwtConstant.java

@@ -11,8 +11,10 @@ public interface JwtConstant {
     public final static long EXPIRATION = 1 * 24 * 60 * 60 * 1000L;
     public final static long TEMP_EXPIRATION = 10 * 60 * 1000L;
     public final static String TOKEN_TYPE = "TOKEN_TYPE";
-    public final static String M_TOKEN = "M_TOKEN"; //后台管理用户token
-    public final static String IUAV_TOKEN = "IUAV_TOKEN"; //小程序token
+    // 后台管理用户token
+    public final static String M_TOKEN = "M_TOKEN";
+    // 小程序token
+    public final static String IUAV_TOKEN = "IUAV_TOKEN";
     public final static String USER_ACCOUNT_ID = "USER_ACCOUNT_ID";
     public final static String ROLE_ID = "ROLE_ID";
 }

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

@@ -18,7 +18,7 @@
         <result property="remark" column="remark"/>
         <result property="portType" column="port_type"/>
         <result property="disable" column="disable"/>
-        <result property="createTime" column="createTime"/>
+        <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
 
         <result property="companyAuthStatus" column="companyAuthStatus"/>

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: 42bc01e508130cfbe19ad17b27456cadc9aee4ca
+  newTag: 8f9846a81bfe03e2e6d2e7e18b1af994e0fdd75f