feature

cx-aps/cx-aps-common/src/main/resources/mybatis/ApsProcessOperationProcessEquDao.xml

@@ -164,7 +164,7 @@
         a1.CHECKOUTROLL,
         a1.UNFINISHROLL,
         a1.WORKSTATUS,
-        a1.LOCKMARK,
+        a2.LOCKMARK,
         a1.HASCONFLICT,
         a1.CONFLICTDES,
         (select CUSTOMERABBREVIATION from aps_customer_management where ID = a6.CUSTOMID and DELETED ='0') AS CUSTOMERABBREVIATION,

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/domain/ApsProcessOperationProcessEquDo.java

@@ -136,6 +136,7 @@ public class ApsProcessOperationProcessEquDo extends BaseDo {
     /**
      * 是否锁定 y：锁定，n：未锁定
      */
+    @Deprecated
     @TableField("LOCKMARK")
     private String lockmark;
     /**