测试git提交冲突问题

刘小明

2024-08-15 830e18bcfac0a9ac2c5c9e175affc4b9c1889a58

 pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/workStation/WorkStationSv.java

@@ -56,7 +56,7 @@
        // 保存history
        StaAssemblyWorkHistory history = new StaAssemblyWorkHistory();
        BeanUtils.copyProperties(workLast,history);
        history.setId(null);
        //history.setId(null);
        int count = assemblyWorkHistoryDao.insertSelective(history);
        //删除last
        assemblyWorkLastDao.deleteByPrimaryKey(id);