承储资格申请字段

src/main/java/com/chinaitop/depot/sqr/mapper/BizSqrEnterpriseApplyMapper.xml

@@ -109,9 +109,9 @@
     </select>
     <select id="findById" resultType="Map" resultMap="BaseResultMap">
         SELECT
-        bgqa.id, A.dwmc,A.id unitInfoId, A.dwdm,A.fddbr,A.dwlx,A.zcdz,A.cfs,A.ygs,A.DICT_LABEL,bgqa.apply_status,bgqa.apply_type,
+        bgqa.id, A.dwmc,A.id unitInfoId, A.dwdm,A.fddbr,A.dwlx,A.zcdz,A.cfs,A.ygs,A.DICT_LABEL,
                bse.certified_storekeeper_count ,bse.certified_inspector_count ,bse.warehouse_facility_situation ,
-               bse.full_time_staff_count ,bse.storage_expire_time ,bse.attachment attachment,bgqa.sqr_enterprise_id
+               bse.full_time_staff_count ,bse.storage_expire_time ,bse.attachment attachment
         FROM
             province_all.biz_sqr_enterprise_apply bgqa
             left join province_all.biz_sqr_enterprise  bse on bgqa.sqr_enterprise_id =bse.id

src/main/java/com/chinaitop/depot/system/controller/UserInfoController.java

@@ -251,12 +251,13 @@ public class UserInfoController {
 	public Map<String, Object> Login(HttpServletRequest request, String username, String password, String yzm, String from) {
 		Map<String, Object> map = new HashMap<String, Object>();
 		if (StringUtils.isBlank(from) || from.compareTo("app")!=0) {
-			String yzm_code = ObjectUtils.toString(request.getSession().getAttribute("Service_Code"),"");
-			if (!yzm_code.equals(yzm)) {
-				map.put("status", false);
-				map.put("success", "验证码输入错误！");
-				return map;
-			}
+//			String yzm_code = ObjectUtils.toString(request.getSession().getAttribute("Service_Code"),"");
+//			if (!yzm_code.equals(yzm)) {
+//				map.put("status", false);
+//				map.put("success", "验证码输入错误！");
+//
+//			}
+			return map;
 		}
 		UserInfo userInfo = null;
 		if(!userInfoService.validUsername(null,username)) {//用户名存在