Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
yuezhihang
2021-08-27 14:41:39 +08:00
@@ -73,7 +73,7 @@ public class ManagerApproveAfter implements TaskListener {
BusProcessName one2 = busProcessNameService.getOne(queryWrapper2);
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
if (one2 != null) {
// one2.setPrcName("入库流程结束");
//one2.setPrcName("入库流程结束");
one2.setOverTime(OVERTIME);
one2.setPrcType("1");
busProcessNameService.saveOrUpdate(one2);