Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java

@@ -130,6 +130,7 @@ public class SysUser extends BaseBean {
     @Column(name = "RESET_PASSWORD_TIME")
     @ApiParam(value = "重置密码的时间")
     private String resetPasswordTime;
+
     /********************************** 关系信息 ********************************/
 
     @Column(name = "DEPARTMENT_ID")

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/model/SysVersionExportModel.java

@@ -0,0 +1,22 @@
+package cn.estsh.i3plus.pojo.platform.model;
+
+import lombok.Data;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : Castle
+ * @CreateDate : 2022/12/10 18:04
+ * @Modify:
+ **/
+@Data
+public class SysVersionExportModel {
+
+    private String startDate;
+
+    private String endDate;
+
+    private String userName;
+
+    private Long roleId;
+}

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/model/SysVersionModel.java

@@ -0,0 +1,33 @@
+package cn.estsh.i3plus.pojo.platform.model;
+
+import lombok.Data;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : Castle
+ * @CreateDate : 2022/12/10 15:56
+ * @Modify:
+ **/
+@Data
+public class SysVersionModel {
+    /**
+     * sys_version_plan_id
+     */
+    private Long planId;
+
+    private String modifyDateTimeStart;
+
+    private String modifyDateTimeEnd;
+    /**
+     * 差异
+     */
+    private String pojoCompare;
+
+    private Long refId;
+
+    /**
+     * 角色id
+     */
+    private Long roleId;
+}

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysOrderNoRuleRepository.java

@@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.platform.repository;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
 import cn.estsh.i3plus.pojo.platform.bean.SysOrderNoRule;
+import org.springframework.stereotype.Repository;
 
 /**
  * @Description : 单号规则
@@ -10,5 +11,6 @@ import cn.estsh.i3plus.pojo.platform.bean.SysOrderNoRule;
  * @CreateDate : 2018-11-21 17:15
  * @Modify:
  **/
+@Repository
 public interface SysOrderNoRuleRepository extends BaseRepository<SysOrderNoRule,Long> {
 }

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java

@@ -403,7 +403,7 @@ public class SoftSwitchHqlPack {
         DdlPreparedPack.getStringEqualPack(suitCaseCode,"suitCaseCodeRdd",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(processState,"processState",ddlPackBean);
 
-        DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()},new String[]{"getDateTime"},ddlPackBean);
+        DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()},new String[]{"createDatetime"},ddlPackBean);
 
         return ddlPackBean;
     }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java

@@ -625,6 +625,10 @@ public class WmsStockSn extends BaseBean {
     @ApiParam("90以上天")
     private double morhanDays;
 
+    @Column(name = "PROD_PICKING_IN_STOCK_TIME")
+    @ApiParam(value = "生产领料入库时间")
+    public String prodPickingInStockTime;
+
     public WmsStockSn(String zoneNo, String lotNo, String partNo, double thirtyDays, double thirtyToSixtyDays, double sixtyToNinetyDays, double morhanDays) {
         this.zoneNo=zoneNo;
         this.lotNo=lotNo;

pom.xml

@@ -166,7 +166,7 @@
             <dependency>
                 <groupId>org.apache.shiro</groupId>
                 <artifactId>shiro-core</artifactId>
-                <version>1.4.0</version>
+                <version>1.10.1</version>
             </dependency>