parent: 8f7460c6 | patch | commit | show whitespace
wzy
2021-11-11 3fd5c0a8919c5b31efb61860aeffaf932236e4a3 
Merge branch 'score_shop' into api_score_meger
3 files modified
5 ■■■■■ changed files
zq-erp/src/main/resources/config/test/system.properties 2 ●●●●● patch | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/common/SysCompanyDao.xml 3 ●●●●● patch | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-beauty-list.html patch | view | raw | blame | history 
 zq-erp/src/main/resources/config/test/system.properties


@@ -48,6 +48,8 @@


wechar_login_url =https://api.weixin.qq.com/sns/jscode2session?appid=%s&secret=%s&js_code=%s&grant_type=authorization_code


xcx_appid =wx5cc58f796224af61


xcx_secret =facea088aae414e5c2ee86b459887721


xcx_manager_appid=wx2948b3b914a9722e


xcx_manager_secret=1685dfd99a43e213ed8be07870b898ba


gzh_appid=wx57e6335559bdbda6


gzh_secret=ecb408af170e3890e6544290cad33760






 zq-erp/src/main/resources/mybatis/mapper/common/SysCompanyDao.xml


@@ -761,7 +761,8 @@


        com_logo,


        com_valid,


        com_functions,


        com_plats


        com_plats,


        com_code


        from sys_company


        <where>


            <if test="record!=null">




 zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-beauty-list.html