Skip to content

C
cloud-platform
Switch branch/tag
  1. 27 Nov, 2019 10 commits
    • jiaorz's avatar
      Merge branch 'master-vehicle-bug' into dev · 2440d2fc
      jiaorz authored
      2440d2fc
    • jiaorz's avatar
      邮件接受账号和标题配置，改为在配置文件中 · 74de1a65
      jiaorz authored
      74de1a65
    • jiaorz's avatar
      Merge remote-tracking branch 'origin/dev' into dev · f0034da0
      jiaorz authored
      f0034da0
    • jiaorz's avatar
      Merge branch 'master-vehicle-bug' into dev · ef1328c8
      jiaorz authored
      ef1328c8
    • jiaorz's avatar
      修改预定记录时间限制显示问题 · ab9088ef
      jiaorz authored
      ab9088ef
    • libin's avatar
      Merge branch 'staff-statistics' into dev · a9a58107
      libin authored
      a9a58107
    • libin's avatar
      员工统计 · b15727e9
      libin authored
      b15727e9
    • libin's avatar
      员工统计 · 796c0ff2
      libin authored
      796c0ff2
    • libin's avatar
      Merge branch 'staff-statistics' into dev · 5be635ae
      libin authored 
      # Conflicts:
#	ace-common/src/main/java/com/github/wxiaoqi/security/common/enumconstant/LevelEnum.java
#	ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/AppUserDetailMapper.java
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/PublicController.java
#	ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml
#	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/dto/OrderDTO.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderAccountBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/BaseOrderMapper.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/OrderAccountMapper.java
#	xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml
#	xx-order/xx-order-server/src/main/resources/mapper/OrderAccountMapper.xml
#	xx-order/xx-order-server/src/test/java/ServiceTest.java
#	xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java
      5be635ae
    • libin's avatar
      员工统计 · 9dc3c069
      libin authored
      9dc3c069
  3. 26 Nov, 2019 9 commits
  5. 25 Nov, 2019 21 commits