parent: d0e7c0db | patch | commit | ignore whitespace
jinpengyong
2023-11-07 dab06e44d031aac4a951cfb01ba9545cc4772fa2 
Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

 Conflicts:
	screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
1 files modified
3 ■■■■■ changed files
screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java 3 ●●●●● patch | view | raw | blame | history 
 screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java


@@ -239,7 +239,8 @@


    }








     @Autowired


     private ResponsibilityUnitService responsibilityUnitService;


    /**


     * 小程序推送


     * @param appAllocationPushUserCond