parent: e357fa | patch | commitdiff
xiaoyong931011
2021-04-07 6beb066cae877ac1ec9b3627fc83bab9a018d3cd
refs
author xiaoyong931011 <15274802129@163.com>
Wednesday, April 7, 2021 16:32 +0800
committer xiaoyong931011 <15274802129@163.com>
Wednesday, April 7, 2021 16:32 +0800
commit6beb066cae877ac1ec9b3627fc83bab9a018d3cd
tree be4e49e761a102358a35ae0bf0e4155d09e722ca tree | zip | gz
parent e357fadecfea809de46740e059bd5f2c72bc89b1 view | diff
44f08bb766c58cd796a592b228ced9d32f29843a view | diff 
Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
55 files deleted
23 files modified
12602 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/system/app/authority/AppAuthorityManager.java 38 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/actions/AdminAction.java 22 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/actions/SysRoleAction.java 8 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/authority/DefaultAuthorityManager.java 81 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/bean/SysFnBtnRel.java 50 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/bean/SysFunction.java 50 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/bean/SysUsers.java 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/constance/AppConstance.java 8 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/service/impl/SysUsersServiceImpl.java 15 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/constance/SystemConstance.java 9 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/BaseController.java 11 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java 46 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java 7 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java 32 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjServices.java 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java 173 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java 12 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysWorktimeServiceImpl.java 26 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpVipInfoController.java 80 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/static/js/function/vip.js 21 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip_bak.html 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-account-card.html 161 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-account-choice.html 176 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-account-detail.html 156 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-account-follow-add.html 218 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-account-follow.html 188 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-account-mealuse.html 177 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-account-msg.html 185 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-account-my.html 259 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-account-potential.html 184 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-account-service.html 186 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-account-turn.html 184 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-account.html 126 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-card-user.html 111 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-search.html 127 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-vip.html 245 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-vipInfo-search.html 265 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-visit-info.html 213 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-visit-list.html 161 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM-visit.html 273 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/mobile/CRM.html 226 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/mobile/_foot.html 19 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/mobile/_pageNav.html 67 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/mobile/cwqk-list.html 227 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/mobile/mls-list.html 248 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/mobile/mobileLogin.html 142 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-car.html 308 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-history-msg.html 280 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-history.html 194 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-list.html 281 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-msg.html 253 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-msg2.html 264 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-msg3.html 289 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-msg4.html 245 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-msg5.html 269 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-search.html 209 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-service.html 289 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-use-completed.html 234 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-use-end-service.html 303 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-use-look-endService.html 320 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-use-new.html 320 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-use-start-service.html 298 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/mobile/order-use-time.html 260 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/mobile/order.html 255 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/mobile/personal-msg.html 288 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/mobile/personal-resetPassWord.html 156 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/mobile/personal-shop-list.html 279 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/mobile/personal-staff-list.html 302 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/mobile/personal-trainingMaterials-data.html 114 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/mobile/personal-trainingMaterials-info.html 98 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/mobile/personal-trainingMaterials1.html 104 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/mobile/personal-trainingMaterials2.html 104 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/mobile/personal.html 229 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/mobile/store-check-detail.html 248 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/mobile/store-check.html 261 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/mobile/vip-archives.html 251 ●●●●● diff | view | raw | blame | history
zq-erp/src/test/java/com/matrix/JyyTests.java 65 ●●●●● diff | view | raw | blame | history
zq-erp/src/test/java/com/matrix/ParameterSettingsTool.java 11 ●●●●● diff | view | raw | blame | history