Merge branch 'refs/heads/master' into mode-min-unit

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

@@ -177,7 +177,7 @@
         DATE(a6.SCHEDULEDELIVERYDATE)> DATE(a6.DELIVERYDATE)
         ),1,0) as conflict,
         a1.SOFTCONFLICTDES,
-        a2.INMATERCONDITION,
+        a2.PLANINPUT AS INMATERCONDITION,
         a6.CUSTOMORDERNO,
         a3.OUTPUTORDERPRODUCT,
         c.NAME AS DEVICETYPE,