Merge branch 'master' into ty_urgent

wzy

2020-12-14 4e5ecd152044d53cc5853037eb60361fff4d11dc

Merge branch 'master' into ty_urgent

 zq-erp/src/main/java/com/matrix/system/hive/statistics/StatisticsBusinessDataJob.java

@@ -79,7 +79,7 @@
        Date today = new Date();

        SysBusinessData sysBusinessData = new SysBusinessData();
        sysBusinessData.setTime(today);
        sysBusinessData.setTime(DateUtil.getDateBefore(today,1));
        businessDataDao.deleteByModel(sysBusinessData);

        List<SysShopInfo> sysShopInfos = shopInfoDao.selectShopInfo(null);

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

@@ -1273,7 +1273,7 @@
    <select id="selectByRoleName" resultMap="SysUsersMap">

        SELECT
        a.*
        distinct a.*
        FROM
        sys_users a
        LEFT JOIN sys_role r ON FIND_IN_SET(r.role_id, a.role_ids)
@@ -1290,7 +1290,6 @@
        <if test="users.shopId !=null and users.shopId !=''">
            AND a.SHOP_ID = #{users.shopId}
        </if>

        ORDER BY
        a.SIGN_ORDER IS NULL,
        a.SIGN_ORDER

 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html

@@ -566,7 +566,7 @@
            //获取用户列表
            AjaxProxy.requst({
                app: _this,
                url: basePath + '/admin/getShopStaffByRoleName?roleName=美疗师',
                url: basePath + '/admin/shopAll',
                callback: function (data) {
                    _this.userList = data.rows;
                }