Skip to content

C
cloud-platform
Switch branch/tag
  1. 04 Nov, 2019 14 commits
    • hanfeng's avatar
      Merge remote-tracking branch 'origin/dev' into dev · 4ccbc618
      hanfeng authored 
      # Conflicts:
#	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/rest/AppUserController.java
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/AppUserRest.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCalculateBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCancelBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/OrderRefundController.java
#	xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java
      4ccbc618
    • hanfeng's avatar
      Merge branch 'master' into dev · 9e0c1ce1
      hanfeng authored 
      # Conflicts:
#	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/biz/AppUserSellingWaterBiz.java
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/AppUserRest.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCalculateBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCancelBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/OrderRefundController.java
#	xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/OrderPayBiz.java
#	xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java
      9e0c1ce1
    • 周健威's avatar
      Merge remote-tracking branch 'origin/dev' into dev · 81ce0510
      周健威 authored
      81ce0510
    • 周健威's avatar
      Merge branch 'holiday-price' into dev · c63b7bdb
      周健威 authored 
      # Conflicts:
#	ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/dto/AppUserDTO.java
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUserController.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/biz/OrderVehicleCrosstownBiz.java
#	xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/feign/ThirdFeign.java
#	xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java
      c63b7bdb
    • hanfeng's avatar
      Merge remote-tracking branch 'origin/master' · 218e3849
      hanfeng authored
      218e3849
    • hanfeng's avatar
      修改实名认证 · 8910eab1
      hanfeng authored
      8910eab1
    • jiaorz's avatar
      Merge branch 'master-alipay-change' into dev · b03fc1f7
      jiaorz authored
      b03fc1f7
    • jiaorz's avatar
      修改预定信息管理筛选条件 · d3b50067
      jiaorz authored
      d3b50067
    • 周健威's avatar
      Merge remote-tracking branch 'origin/dev' into dev · cb4730b7
      周健威 authored
      cb4730b7
    • 周健威's avatar
      Merge branch 'master-alipay-change' into dev · 6e325d61
      周健威 authored 
      # Conflicts:
#	xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/OrderPayBiz.java
      6e325d61
    • 周健威's avatar
      去除前后一天的冗余限制 · 778ad949
      周健威 authored
      778ad949
    • 周健威's avatar
      修改代码 · 5bfb3ea8
      周健威 authored
      5bfb3ea8
    • jiaorz's avatar
      修改后台取消订单 · f489541d
      jiaorz authored
      f489541d
    • libin's avatar
      用户信息编辑 · e6011491
      libin authored
      e6011491
  3. 01 Nov, 2019 23 commits
  5. 31 Oct, 2019 3 commits