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/JgScrapCancelServiceImpl.java

@@ -542,7 +542,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
                     .filter(entry -> entry.getValue() != null)
                     .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (existing, replacement) -> existing));
             collect.put("equList", equList);
-            collect.put("EQU_LIST_CODE", equList);
+//            collect.put("EQU_LIST_CODE", equList);
             return new HashMap<String, Object>() {{
                 this.put(PAGE_KEY, collect);
             }};