parent: 4bd809 | patch | commitdiff
jyy
2021-01-16 de589b98ff007afdcec9d6cef5d1a2b168031b98
refs
author jyy <935090232@qq.com>
Saturday, January 16, 2021 16:12 +0800
committer jyy <935090232@qq.com>
Saturday, January 16, 2021 16:12 +0800
commitde589b98ff007afdcec9d6cef5d1a2b168031b98
tree b460fe249dd145a160fc565aea27060a4adfeeda tree | zip | gz
parent 4bd80985d1bbb835a6f992f533e24551d769aba0 view | diff
ebe1a5b7aff27fb05ed4f343a8e66e6f42fc034b view | diff 
Merge remote-tracking branch 'origin/api' into api
11 files modified
157 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/system/app/action/ApiOrderAction.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/action/ApiStatisticsAction.java 42 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/dto/OrderListDto.java 11 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/CardLevelController.java 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/bean/SysVipLevel.java 8 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hiveErp/dao/TjVipSumDao.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml 6 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysVipLevelDao.xml 16 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/TjVipSumDao.xml 65 ●●●●● diff | view | raw | blame | history