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

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/CommonServiceImpl.java

@@ -1503,7 +1503,9 @@ public class CommonServiceImpl implements ICommonService {
     @Override
     public Object updateHistory(Map<String, Object> map) {
         String historyEquType = (String) map.get(HISTORY_EQU_TYPE);
+        String historySubmitType = (String) map.get(HISTORY_SUBMIT_TYPE);
         JSONObject jsonObject = new JSONObject(map);
+        jsonObject.put("historySubmitType", historySubmitType);
         switch (historyEquType) {
             case "unit":
 //                return jgUseRegistrationServiceImpl.handleUnitHistoryEquip(jsonObject);