gongbiao
|
90c94ee53f
|
Merge tag 'refs/tags/jenkins-back-end-3100' into release
develop
|
пре 6 година |
gongbiao
|
fc5b13a00c
|
[账单总览][修改][查询]
|
пре 6 година |
gongbiao
|
7931536f6d
|
Merge tag 'refs/tags/jenkins-back-end-3099' into release
develop
|
пре 6 година |
gongbiao
|
54b3c8da41
|
[账单][修改][手续费与滞纳金变更]
|
пре 6 година |
Burce
|
d394283c05
|
[招商][预约提醒]查询时间
|
пре 6 година |
gongbiao
|
600cecefc0
|
Merge tag 'refs/tags/jenkins-back-end-3097' into release
develop
|
пре 6 година |
gongbiao
|
03f95d8b9d
|
[账单][修改][应收金额变更]
|
пре 6 година |
gongbiao
|
07636fad44
|
[结算管理][修改][押金]
|
пре 6 година |
gongbiao
|
f41b20ef99
|
Merge tag 'refs/tags/jenkins-back-end-3094' into release
develop
|
пре 6 година |
gongbiao
|
78c1f97f28
|
[结算管理][修改][押金]
|
пре 6 година |
gongbiao
|
a79acee675
|
[结算管理][修改][押金]
|
пре 6 година |
gongbiao
|
613454fdc4
|
[结算管理][修改][押金]
|
пре 6 година |
Burce
|
a995af1973
|
[招商][操作记录]
|
пре 6 година |
gongbiao
|
756cb352cc
|
Merge tag 'refs/tags/jenkins-back-end-3092' into release
develop
|
пре 6 година |
Burce
|
1ab4c211bc
|
[招商]adjust
|
пре 6 година |
gongbiao
|
97cf97bbec
|
[sql[修改][账单修改字段默认值]
|
пре 6 година |
gongbiao
|
08787e1c99
|
[账单[修改][实际应收金额影响欠缴]
|
пре 6 година |
gongbiao
|
be15f9393a
|
[结算管理][修改][查询押金]
|
пре 6 година |
gongbiao
|
c4ab01412b
|
[结算管理][修改][查询押金]
|
пре 6 година |
gongbiao
|
b7da4c4643
|
Merge tag 'refs/tags/jenkins-back-end-3086' into release
develop
|
пре 6 година |
Burce
|
04a94cb5ff
|
[招商]adjust
|
пре 6 година |
Burce
|
c99b470643
|
[招商]adjust
|
пре 6 година |
gongbiao
|
8724f74403
|
[结算管理][修改][查询]
|
пре 6 година |
gongbiao
|
4670f5b364
|
[账单总览][修改][查询]
|
пре 6 година |
gongbiao
|
04cfab0406
|
Merge tag 'refs/tags/jenkins-back-end-3083' into release
develop
|
пре 6 година |
gongbiao
|
ca39de7f0e
|
[线上交易][修改][查询]
|
пре 6 година |
gongbiao
|
3a3d41ccc0
|
Merge tag 'refs/tags/jenkins-back-end-3081' into release
develop
|
пре 6 година |
gongbiao
|
34887bcced
|
[线上交易][修改][导出]
|
пре 6 година |
gongbiao
|
e3887a7b8d
|
[线上交易][修改][查询]
|
пре 6 година |
gongbiao
|
0311943afa
|
[线上交易][修改][查询]
|
пре 6 година |
gongbiao
|
90652f41eb
|
[账单][修改][押金手续费]
|
пре 6 година |
Burce
|
db8eaf05fe
|
[招商]adjust
|
пре 6 година |
gongbiao
|
213a9aff05
|
[营销结算][修改][总计]
|
пре 6 година |
Burce
|
af4d0409d7
|
[招商]adjust
|
пре 6 година |
Burce
|
537c0dfeab
|
[招商]adjust
|
пре 6 година |
gongbiao
|
4168b42813
|
[账单][修改][欠缴显示]
|
пре 6 година |
gongbiao
|
9222dff182
|
[合同][修改][账单欠缴]
|
пре 6 година |
Burce
|
f60b47e446
|
[招商]update sql
|
пре 6 година |
gongbiao
|
4a6e889ef8
|
Merge tag 'refs/tags/jenkins-back-end-3074' into release
develop
|
пре 6 година |
Burce
|
7cdb11d5c7
|
[招商]adjust
|
пре 6 година |
gongbiao
|
088b5eb3d9
|
[商铺租金账单][修改][押金没有手续费]
|
пре 6 година |
gongbiao
|
0003e780df
|
[商铺租金账单][修改][押金判断]
|
пре 6 година |
Burce
|
9c99cf039f
|
[招商][客户编号]
|
пре 6 година |
gongbiao
|
9b5ece2fe4
|
[账单][修改][手续费生成]
|
пре 6 година |
Burce
|
2beb7db3c7
|
[招商]更新指派人
|
пре 6 година |
Burce
|
6db2e76384
|
[招商]adjust
|
пре 6 година |
Burce
|
6e6906edfe
|
[招商]超过权限修改
|
пре 6 година |
gongbiao
|
6239249855
|
[营销结算][修改][排除券为0分账]
|
пре 6 година |
Stormeye Wu
|
f620482157
|
Merge tag 'refs/tags/jenkins-back-end-3065' into release
develop
# Conflicts:
# mallinkAdmin/src/main/java/com/iformall/config/RedisConfig.java
# mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java
# mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPasswordController.java
# mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPresentController.java
# mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java
# mallinkBApi/src/main/java/com/iformall/config/RedisConfig.java
# mallinkCApi/src/main/java/com/iformall/config/RedisConfig.java
# mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java
# mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java
# mallinkCallback/src/main/java/com/iformall/config/RedisConfig.java
# mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarETCPCallBackController.java
# mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarTJDCallBackController.java
# mallinkMQConsumer/src/main/java/com/iformall/config/RedisConfig.java
# mallinkPosApi/src/main/java/com/iformall/config/RedisConfig.java
# mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java
# mallinkSchedule/src/main/java/com/iformall/config/RedisConfig.java
# mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java
# mallinkService/src/main/java/com/iformall/domain/po/WxCouponPassword.java
# mallinkService/src/main/java/com/iformall/domain/po/WxCouponPresent.java
# mallinkService/src/main/java/com/iformall/domain/po/WxPayAccount.java
# mallinkService/src/main/java/com/iformall/service/WxCouponPasswordService.java
# mallinkService/src/main/java/com/iformall/service/WxCouponService.java
# mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java
# mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java
# mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java
# mallinkService/src/main/java/com/iformall/service/impl/WxCouponPresentServiceImpl.java
# mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java
# mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java
# mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java
# mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java
# mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java
# mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java
# mallinkService/src/main/java/com/iformall/service/impl/WxSubsidyServiceImpl.java
# mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java
# mallinkService/src/main/resources/mapper/WxCouponMapper.xml
# mallinkSysAdmin/src/main/java/com/iformall/config/RedisConfig.java
# mallinkWebSocketServer/src/main/java/com/iformall/config/RedisConfig.java
|
пре 6 година |
Stormeye Wu
|
746550967b
|
[C端][优化]:首页券列表优化
|
пре 6 година |