Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-15 d7c3b9d46cc331cfc57446d77c44e4c138addd72

 flower_city/src/main/java/com/dg/core/service/IGuideRepairOrderService.java

@@ -49,6 +49,13 @@
     */
    int countConfigList(String matterName,List<String> ids);


    /**
     * 很具用户id查询是否有对应工单
     * @return
     */
    int countUser(String userId,String state);

    /**
     * 根据进展类修改用户代办数量
     * @param order