Merge branch 'develop' into test-transfer

* develop:
  。。

kxs-transfer/src/main/java/com/kxs/transfer/api/controller/DtsController.java

@@ -229,7 +229,7 @@ public class DtsController {
             if ("SchoolMakerStudy".equals(dmlData.getTableName())) {
                 kxsSchoolStudyService.changeData(dmlData);
             }
-            //机具表
+            //机具表12
             if ("PosMachinesTwo".equals(dmlData.getTableName())) {
                 kxsMachineService.changeData(dmlData);
             }