parent: cb97fd | patch | commitdiff
jyy
2021-04-13 8c383fda066ba6166ec3bf622d44d8b17bfac71f
refs
author jyy <935090232@qq.com>
Tuesday, April 13, 2021 15:27 +0800
committer jyy <935090232@qq.com>
Tuesday, April 13, 2021 15:27 +0800
commit8c383fda066ba6166ec3bf622d44d8b17bfac71f
tree 9c37b2b8f6d7ce09b879af1642706e092a2fba59 tree | zip | gz
parent cb97fd90e674cf4cb882c49eed107b4bcae97aff view | diff
bed498f8217abc0bf746bf381d9e0457b13c42c3 view | diff 
Merge remote-tracking branch 'origin/score_shop' into score_shop
4 files modified
322 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopOrderAction.java 47 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/pojo/ShopOrderQueryPOJO.java 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopOrderDao.xml 37 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/shop/shopOrder-list.html 234 ●●●●● diff | view | raw | blame | history