parent: 924a90 | patch | commitdiff
Helius
2022-05-23 5011c035b9902637b1cb4d08112e00239ff99381
refs
author Helius <wangdoubleone@gmail.com>
Monday, May 23, 2022 12:05 +0800
committer Helius <wangdoubleone@gmail.com>
Monday, May 23, 2022 12:05 +0800
commit5011c035b9902637b1cb4d08112e00239ff99381
tree 0cfefabe6454d830c217284ec3a0ef93c3e326d2 tree | zip | gz
parent 924a90bc1c4601bc51ceb0875858a093a97cde67 view | diff
81507d0c196821cd333f08c75f3978e726df24cd view | diff 
合并master
64 files modified
9 files added
2 files renamed
1361 ■■■■■ changed files
zq-erp/pom.xml 5 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/beauty/followup/dao/SysFollowupDao.java 12 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/beauty/followup/entry/SysFollowup.java 6 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/beauty/followup/service/SysFollowupService.java 89 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java 5 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/action/ApiFollowupAction.java 62 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/action/AppOccupancyController.java 21 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/authority/AppAuthorityManager.java 11 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/dto/CreateServiceOrderDto.java 11 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/dto/FreeBedDto.java 43 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/authority/DefaultAuthorityManager.java 15 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/authority/strategy/AccountPasswordLogin.java 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/bean/SysCacheValue.java 39 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/dao/SysCacheValueDao.java 14 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/init/LocalCache.java 185 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/init/UserCacheManager.java 6 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/interceptor/ApiUserLoginInterceptor.java 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/interceptor/HostInterceptor.java 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/service/impl/SysUsersServiceImpl.java 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/tools/LocationUtil.java 9 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/FollowuController.java 40 ●●●●● 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/ProjUseController.java 17 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/ServiceRecordController.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java 11 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/dao/MoneyCardUseDao.java 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/dao/SysShopInfoDao.java 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/dao/SysVipAlbumDao.java 11 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/dao/SysVipInfoDao.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/dto/FollowuListDto.java 36 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/SysVipInfoService.java 7 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/ShoppingGoodsServiceImpl.java 29 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysGoodsServiceImpl.java 7 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java 26 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java 7 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpVipInfoController.java 9 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxUserAction.java 28 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/YuyueAction.java 8 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/impl/WxShopActivitiesSecKillServiceImpl.java 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/application-alpha.properties 45 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/application-local.properties 9 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/application.properties 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/prd/system.properties 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignWriteoffDao.xml 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/common/OperstionLogDao.xml 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml 32 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml 12 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/MoneyCardUseDao.xml 13 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/MyBeauticianCountDao.xml 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/ServicesFlowDao.xml 14 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysFollowupDao.xml 32 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml 17 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysShopInfoDao.xml 7 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml 67 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesGroupJoinDao.xml 8 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesSeckillRecordDao.xml 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopProductCommentDao.xml 5 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/static/plugin/vue-treeselect/vue-treeselect.min.css 5 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/static/plugin/vue-treeselect/vue-treeselect.umd.min.js 7 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive-erp/vip/vipInfo-list.html 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/servicceAddForm.html 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/updateServiceOrderTimeV2.html 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yyServiceAddForm.html 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/products/goods-form.html 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/products/shoppinggoods-zb-list.html 20 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/vip/followu-list.html 206 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/vip/vipInfo-list.html 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/test/java/com/matrix/BizUserToVipInfoTool.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/test/java/com/matrix/JyyTests.java 11 ●●●●● diff | view | raw | blame | history
zq-erp/src/test/java/com/matrix/LocalCacheTest.java 6 ●●●●● diff | view | raw | blame | history