parent: 505358 | patch | commitdiff
935090232@qq.com
2021-07-29 bf60845c8da9d0099ef25c8e6703351055865a8e
refs
author 935090232@qq.com <ak473600000>
Thursday, July 29, 2021 20:35 +0800
committer 935090232@qq.com <ak473600000>
Thursday, July 29, 2021 20:35 +0800
commitbf60845c8da9d0099ef25c8e6703351055865a8e
tree 338e4a9b34ffbb6062d4dc5b924895d9c2e8bcbf tree | zip | gz
parent 5053580940013389d2d667f5561573ae17dddbe5 view | diff
a907b1ee8b387defa748afe66502b4720d66ee0e view | diff 
Merge remote-tracking branch 'origin/score_shop' into score_shop
41 files modified
1 files deleted
718 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java 11 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/authority/AppAuthorityManager.java 7 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/dto/CreateServiceOrderDto.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/vo/VipInfoListVo.java 11 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/bean/SysRole.java 13 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/bean/SysUsers.java 10 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/tag/ButtonRoleJsTagProcessor.java 93 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/tag/MatrixProcessorDialect.java 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/tools/DataAuthUtil.java 9 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/ProjUseController.java 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java 21 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java 23 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/statistics/OrderStatisticsAction.java 78 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/statistics/ProjUseStatisticsAction.java 43 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/statistics/ServiceStatisticsAction.java 43 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/statistics/moneyCardUseStatisticsAction.java 40 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpVipInfoController.java 20 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/mdprd/system.properties 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/common/SysRoleDao.xml 14 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/common/SysUsersDao.xml 7 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml 8 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive-erp/order/sysOrder-list.html 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-moneyCar-item.html 10 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-moneyCar-summary.html 14 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-order-item.html 8 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-order-summary.html 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-projSercice-item.html 15 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-projSercice-sumary.html 14 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-projuse-item.html 12 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-projuse-sumary.html 15 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive-erp/vip/vipInfo-list.html 23 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-moneyCar-item.html 13 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-moneyCar-summary.html 15 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-order-item.html 14 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-order-summary.html 14 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-projSercice-item.html 15 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-projSercice-sumary.html 14 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-projuse-item.html 12 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-projuse-sumary.html 15 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/vip/vipInfo-list.html 20 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/sys/sysRole-form.html 8 ●●●●● diff | view | raw | blame | history