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

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgInstallationNoticeEqMapper.java

@@ -9,6 +9,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author system_generator
  * @date 2023-12-18
  */
-public interface JgInstallationNoticeEqMapper extends BaseMapper<JgInstallationNoticeEq> {
+public interface JgInstallationNoticeEqMapper extends CustomBaseMapper<JgInstallationNoticeEq> {
 
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgInstallationByWorkFlowController.java

@@ -79,8 +79,7 @@ public class JgInstallationByWorkFlowController {
     public ResponseModel<JgInstallationNoticeDto> accept(@RequestBody Map<String, Object> model, String op) {
         // TODO 受理安装告知流程
         LinkedHashMap model1 = (LinkedHashMap)model.get("model");
-        LinkedHashMap form = (LinkedHashMap)model1.get("form");
-        LinkedHashMap installationInfo = (LinkedHashMap)form.get("installationInfo");
+        LinkedHashMap installationInfo = (LinkedHashMap)model1.get("installationInfo");
         JgInstallationNoticeDto jgInstallationNoticeDto = JSON.parseObject(JSON.toJSONString(installationInfo), JgInstallationNoticeDto.class);
         jgInstallationNoticeServiceImpl.accept(jgInstallationNoticeDto,op);
         return ResponseHelper.buildResponse(null);