ly fix bug

master/src/main/java/com/ruoyi/project/plant/domain/TMtdItem.java

@@ -48,7 +48,7 @@ public class TMtdItem extends BaseEntity
     private String createrCode;
 
     /** 创建时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
     @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date createdate;
 

master/src/main/java/com/ruoyi/project/sems/service/impl/TSpecReportServiceImpl.java

@@ -222,12 +222,12 @@ public class TSpecReportServiceImpl implements ITSpecReportService {
         );
         sheet.addMergedRegion(mergedRegion);
 
-        renderCell(wb, sheet, ylrqList, 14, 1);
-        renderCell(wb, sheet, ylgdList, 14, 4);
-        renderCell(wb, sheet, glList, 14, 7);
-        renderCell(wb, sheet, dtList, 14, 10);
-        renderCell(wb, sheet, dzsbList, 14, 13);
-        renderCell(wb, sheet, ccList, 14, 16);
+        renderCell(wb, sheet, ylrqList, 15, 1);
+        renderCell(wb, sheet, ylgdList, 15, 4);
+        renderCell(wb, sheet, glList, 15, 7);
+        renderCell(wb, sheet, dtList, 15, 10);
+        renderCell(wb, sheet, dzsbList, 15, 13);
+        renderCell(wb, sheet, ccList, 15, 16);
     }
 
     //三个月到期渲染

master/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java

@@ -185,7 +185,7 @@ public class SysLoginController extends BaseController {
         body.put("grant_type", new LinkedList<String>(){{ add("authorization_code"); }});
 
 //        body.put("client_secret", new LinkedList<String>(){{ add("FdR8Q~hmMJsJtJzPhDntTMwRv2WKD6dEhpSKraqk"); }});
-        body.put("client_secret", new LinkedList<String>(){{ add("Ntg8Q~n3Ky7BnMo.xWW5BITBrTHjjDupZV5LSadW"); }});
+        body.put("client_secret", new LinkedList<String>(){{ add("DzS8Q~EKILR6BpDTYLqKzkJ0oDtzSpptMY~uBcY."); }});
 
 //        body.put("client_id", new LinkedList<String>(){{ add("3db6f125-db4d-456b-a76e-a6d03182e845"); }});
         body.put("client_id", new LinkedList<String>(){{ add("13848745-b09e-4105-a48b-180c0c9d13fd"); }});

master/src/main/resources/mybatis/plant/TMtdItemMapper.xml

@@ -42,6 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
+        order by d.id
     </select>
 
     <select id="selectTMtdItemById" parameterType="Long" resultMap="TMtdItemResult">
@@ -62,7 +63,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="actionby != null">actionby,</if>
             <if test="delFlag != null">del_flag,</if>
             <if test="createrCode != null">creater_code,</if>
-            <if test="createdate != null">createdate,</if>
             <if test="updaterCode != null">updater_code,</if>
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
@@ -76,7 +76,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="actionby != null">#{actionby},</if>
             <if test="delFlag != null">#{delFlag},</if>
             <if test="createrCode != null">#{createrCode},</if>
-            <if test="createdate != null">#{createdate},</if>
             <if test="updaterCode != null">#{updaterCode},</if>
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
@@ -93,7 +92,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="actionby != null">actionby = #{actionby},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
             <if test="createrCode != null">creater_code = #{createrCode},</if>
-            <if test="createdate != null">createdate = #{createdate},</if>
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>

ui/src/views/system/user/index.vue

@@ -306,8 +306,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('角色')">
-              <el-select v-model="form.roleIds" multiple :placeholder="$t('请选择')">
+            <el-form-item :label="$t('角色')" prop="roleIds">
+              <el-select v-model="form.roleIds"  multiple :placeholder="$t('请选择')">
                 <el-option
                   v-for="item in roleOptions"
                   :key="item.roleId"
@@ -566,6 +566,9 @@ export default {
         password: [
           { required: true, message: this.$t('用户密码') + this.$t('不能为空'), trigger: "blur" }
         ],
+        roleIds: [
+          { required: true,type: 'array', min: 1,  message: this.$t('角色') + this.$t('不能为空'), trigger: "blur" }
+        ],
         email: [
           { required: true, message: this.$t('邮箱') + this.$t('不能为空'), trigger: "blur" },
           {