parent: 12bdaf | patch | commitdiff
Helius
2021-07-20 9a341d58bf0cfc4d9c0b9be745671f4e5c490b02
refs
author Helius <wangdoubleone@gmail.com>
Tuesday, July 20, 2021 14:29 +0800
committer Helius <wangdoubleone@gmail.com>
Tuesday, July 20, 2021 14:29 +0800
commit9a341d58bf0cfc4d9c0b9be745671f4e5c490b02
tree ed745ac7e74925ae40dc7b84948e20a496e5d0fd tree | zip | gz
parent 12bdaf99a9abf9e3930b449c65dd427c861b0ca4 view | diff
2443f547c0a981e38c5c6e9229e1068d8f831dd0 view | diff 
Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
8 files modified
2 files added
602 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java 21 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive-erp/order/serviceOrderDetail.html 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form-bak2.html 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/pbxq-form-bak.html 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/pbxq-form.html 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/print-service.html 191 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/service-hk.html 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/printTemplates/print-service-meidu.html 177 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/printTemplates/print-service-taiyan.html 197 ●●●●● diff | view | raw | blame | history