beauty-erp.git - Gitblit

Helius

2022-02-10 91e4d0c81321f9ccfec7fca41898a00ff6f57001

refs
author	Helius <wangdoubleone@gmail.com>
	Thursday, February 10, 2022 15:03 +0800
committer	Helius <wangdoubleone@gmail.com>
	Thursday, February 10, 2022 15:03 +0800
commit	91e4d0c81321f9ccfec7fca41898a00ff6f57001
tree	497ceb3099a4122ff01f8857466b5dda9fa1f27a tree \| zip \| gz
parent	35ebb30621630783a4e38dad00c5cb90e1430238 view \| diff 4915156f5e5b321a48eba19746bbcc740f34a881 view \| diff

merge api_score_merge

69 files modified

3 files added

	zq-erp/pom.xml	17 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/app/vo/ServiceProjVo.java	12 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/app/vo/ServiceTcVo.java	12 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/common/dao/SysCompanyDao.java	1 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/common/dao/SysRolePwoerFnDao.java	1 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/common/init/InitWebContainer.java	8 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/common/service/impl/SysCompanyServiceImpl.java	548 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/constance/Dictionary.java	2 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/hive/action/MoneyCardUseController.java	4 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java	2 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java	50 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/hive/action/ShoppingGoodsController.java	27 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrderFlow.java	142 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjUse.java	12 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/hive/dao/MoneyCardUseFlowDao.java	2 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/hive/dao/SysProjServicesDao.java	3 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/hive/dao/SysProjUseDao.java	2 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/hive/dto/ServiceOrderTimeDto.java	34 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/hive/service/SysProjUseService.java	2 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java	1 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjUseServiceImpl.java	5 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/hive/statistics/OrderFlowAction.java	3 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/hive/statistics/OrderStatisticsAction.java	4 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/hive/statistics/ProjUseStatisticsAction.java	4 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/hive/vo/OrderFlowVo.java	108 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/hive/vo/ServiceOrderInfoVo.java	69 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/oa/actions/OaFixedAssetsAction.java	273 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/impl/WXShopOrderServiceImpl.java	15 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopProduct.java	5 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/config/dev/config.json	8 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/config/lhx/config.json	8 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/config/mdprd/application.properties	3 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/config/mdprd/config.json	8 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/config/prd/application.properties	2 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/config/xcx/config.json	8 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/mybatis/mapper/common/SysCompanyDao.xml	3 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/mybatis/mapper/common/SysRolePwoerFnDao.xml	19 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/mybatis/mapper/hive/MoneyCardUseFlowDao.xml	6 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderFlowDao.xml	7 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderItemDao.xml	11 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml	6 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml	13 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopProductDao.xml	11 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/static/js/systools/AjaxProxyVue.js	4 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-order.html	5 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-setting.html	6 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive-erp/order/orderXq-form.html	4 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/daily-list-new.html	2 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/jyls.html	5 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-order-item.html	5 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-projuse-item.html	9 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/cz-form.html	16 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html	3 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form.html	4 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/service_all_list.html	2 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/updateServiceOrderTime.html	7 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/updateServiceOrderTimeV2.html	126 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html	14 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/printTemplates/meidu.html	6 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/printTemplates/print-service-meidu.html	8 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/products/shoppinggoods-md-list.html	2 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/products/shoppinggoods-zb-list.html	2 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-list-new.html	2 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/statistics/jyls.html	5 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-order-item.html	5 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-projuse-item.html	10 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/vip/moneyCardUseFlow-list.html	1 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/oa/assets/fixeAssets-list.html	7 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/shop/shopAdvertisType-list.html	4 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/shop/shopProduct-form.html	16 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/super/sysCompany-form.html	378 ●●●●● diff \| view \| raw \| blame \| history
	zq-xcx/project.config.json	444 ●●●●● diff \| view \| raw \| blame \| history