parent: 91e4d0 | patch | commitdiff
Helius
2022-02-14 c34b0342177c90564ee5c9d3ef25c7442aaf71ba
refs
author Helius <wangdoubleone@gmail.com>
Monday, February 14, 2022 14:59 +0800
committer Helius <wangdoubleone@gmail.com>
Monday, February 14, 2022 14:59 +0800
commitc34b0342177c90564ee5c9d3ef25c7442aaf71ba
tree c16bac91223640113a82d3131b6586d4a87a17bf tree | zip | gz
parent 91e4d0c81321f9ccfec7fca41898a00ff6f57001 view | diff
59cf24b0aba393e145f4ba3d58e98b7a01a80992 view | diff 
Merge branch 'api_score_meger' into alpha
9 files modified
1 files added
210 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoOrderAction.java 54 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanOrderDao.java 5 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanOrderService.java 7 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/vo/FenxiaoOrderListExportVo.java 40 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/vo/LoadFenxiaoOrderBasicVo.java 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanOrderDao.xml 68 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-order.html 16 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/servicceAddForm.html 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yyServiceAddForm.html 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/shop/shopUser-list.html 13 ●●●●● diff | view | raw | blame | history