• litengwei's avatar
    Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register · 565c3b13
    litengwei authored
    # Conflicts:
    #	amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgInstallationNotice.java
    #	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/JgInstallationNoticeServiceImpl.java
    565c3b13
JgInstallationNoticeMapper.xml 4.84 KB