• cq990612's avatar
    Merge remote-tracking branch 'origin/master' · 24848fff
    cq990612 authored
    # Conflicts:
    #	wisenergy-common/src/main/java/cn/wisenergy/common/utils/exception/BASE_RESP_CODE_ENUM.java
    #	wisenergy-mapper/src/main/java/cn/wisenergy/mapper/WorkCollectMapper.java
    #	wisenergy-mapper/src/main/java/cn/wisenergy/mapper/WorkDeptMapper.java
    #	wisenergy-mapper/src/main/java/cn/wisenergy/mapper/WorkProjectMapper.java
    #	wisenergy-mapper/src/main/java/cn/wisenergy/mapper/WorkSbumitAdoptMapper.java
    #	wisenergy-mapper/src/main/java/cn/wisenergy/mapper/WorkTimeOrderMapper.java
    #	wisenergy-mapper/src/main/java/cn/wisenergy/mapper/WorkUserDeptMapper.java
    #	wisenergy-mapper/src/main/java/cn/wisenergy/mapper/WorkUserMapper.java
    #	wisenergy-mapper/src/main/resources/mapper/WorkCollectMapper.xml
    #	wisenergy-mapper/src/main/resources/mapper/WorkDeptMapper.xml
    #	wisenergy-mapper/src/main/resources/mapper/WorkProjectChangeMapper.xml
    #	wisenergy-mapper/src/main/resources/mapper/WorkProjectMapper.xml
    #	wisenergy-mapper/src/main/resources/mapper/WorkSbumitAdoptMapper.xml
    #	wisenergy-mapper/src/main/resources/mapper/WorkTimeOrderMapper.xml
    #	wisenergy-mapper/src/main/resources/mapper/WorkUserDeptMapper.xml
    #	wisenergy-mapper/src/main/resources/mapper/WorkUserMapper.xml
    #	wisenergy-model/src/main/java/cn/wisenergy/model/app/WorkDept.java
    #	wisenergy-model/src/main/java/cn/wisenergy/model/app/WorkProject.java
    #	wisenergy-model/src/main/java/cn/wisenergy/model/app/WorkProjectChange.java
    #	wisenergy-model/src/main/java/cn/wisenergy/model/app/WorkTimeOrder.java
    #	wisenergy-model/src/main/java/cn/wisenergy/model/app/WorkUser.java
    #	wisenergy-model/src/main/java/cn/wisenergy/model/app/WorkUserProject.java
    #	wisenergy-service/src/main/java/cn/wisenergy/service/WorkCollectService.java
    #	wisenergy-service/src/main/java/cn/wisenergy/service/WorkDeptService.java
    #	wisenergy-service/src/main/java/cn/wisenergy/service/WorkHolidayService.java
    #	wisenergy-service/src/main/java/cn/wisenergy/service/WorkProjectService.java
    #	wisenergy-service/src/main/java/cn/wisenergy/service/WorkSbumitAdoptService.java
    #	wisenergy-service/src/main/java/cn/wisenergy/service/WorkTimeOrderService.java
    #	wisenergy-service/src/main/java/cn/wisenergy/service/WorkUserDeptService.java
    #	wisenergy-service/src/main/java/cn/wisenergy/service/WorkUserProjectService.java
    #	wisenergy-service/src/main/java/cn/wisenergy/service/WorkUserService.java
    #	wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkCollectServiceImpl.java
    #	wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkDeptServiceImpl.java
    #	wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkHolidayServiceImpl.java
    #	wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkProjectServiceImpl.java
    #	wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkSbumitAdoptServiceImpl.java
    #	wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkTimeOrderServiceImpl.java
    #	wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkUserDeptServiceImpl.java
    #	wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkUserProjectServiceImpl.java
    #	wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkUserServiceImpl.java
    #	wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/WorkCollectController.java
    #	wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/WorkUserController.java
    #	wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/common/BaseController.java
    #	wisenergy-web-admin/src/main/resources/application-dev.yml
    #	wisenergy-web-admin/src/main/resources/application.yml
    24848fff
Name
Last commit
Last update
..
src/main/java/cn/wisenergy/service Loading commit data...
.gitignore Loading commit data...
pom.xml Loading commit data...
wisenergy-service.iml Loading commit data...